Moved tests into separate folders