Mentor

Fix broken tests on Ryan and Skud's PR.