switch to java7 - modify jUnit test (changed HashMap string order