Thanks for reviewing that. I made the changes you suggested and added a test case for the adjacent module test loading bug.