Change some generic signatures to work around Java 6 generic type inference
Fix erroneous test job.