fix tests for module refactor (part 2)