More test consistency fixes (#267)