GitHub #62 - More test fixes