remove modules, fix tests (part 3)