fix tests for new rework