Moved tests into test folder for cleaner root