Make all changes necessary to get all tests passing