Final fixes to java mutation testing