Move existing tests into test directory