Moved tests to test folder