Fixed up exercise factories after format changes