restructure test folder to allow for Travis CI