refactor tests
restructure tests