Moved all tests into test folder