move tests into test directory