Use only jdk1.6 compliant constructs in the tests