Got tests to pass again