restructure tests a bit, fix test path