Resolve minor issue, and fix tests