Start adapting tests for classes