- fixed the packages for the test classes after the restructure