Fixed classes to pass the test until the grouping phase.