Improve tests after conversion from Groovy to Java

[thoutbeckers]

The tests were converted from Groovy to Java in a semi-automated way so they can be cross-compiled to ObjectiveC. This is why currently they are a bit strange looking.