Moved tests into test directory