#109 Fix tests