Fix unit test module ordering