Fix tests

(even though they're ignored...)