[FIX] adopt to new class interface
[TEST] adopt tests to class interface