Moved tests into new folder