fixed typos in tests
fixed inner-class definitionts