Moved tests into their folder