new package layout for tests