Tests pass, again :)