Moved tests into seperate classes based on methods