CF #27 - Fix tests