Cleaning
Test tried to move the expression result into a generic type.

Java hates me.....