GitHub #88 - Fix tests