Fixed broken tests due to missing comparison on Integer.class etc