Issue #302: More test fixes :panda_face: