Moved tests into a system folder