Pass more unit tests for #972 - madd props to @pglewis