#12 Fix tests