restructured tests into seperate classes