Cleaned tests and updated Travis config