GitHub #62 - Even more test fixes