Moving tests into the package of modules which they are testing