SAMZA-16; fix java 7 test incompatibility