fix tests for module refactor (part 4 ... done)