#653 - clean up sign confusion, fix tests