Added standards for generation tests
Added standards for generation tests. Updated some classes