starting to restructure tests