adaped tests to new code