Move test into test folder