#406 Fix tests