[#1180] *Really* fix tests