Removed use of diamond operator in tests.

This was the only impact of moving java language level back to 6.