Rewrite tests to cope with new hawtness