Moved tests into sub folders