update all tests for class-based interface