#30 Fix tests