restructure tests (again