Moved tests into separate folder