#1036 Fix tests