issues with classes fixed 8 tests failing