restructure tests into specific classes