Removed the coding that was not compliant with -source 1.5 in the unit tests