Test fixture code is in a better shape