Changed test folder, updated travis file