Moved tests into their directory