Moved tests to a test folder