TST: fix tests for new refactor