Java/Groovy interop
Restore solutions, add some more collection tests.