move tests back into test directory