[TEST] adapt and fix tests