Got tests to pass again, hopefully Travis works