Refactoring to fix inconsistency in subtract test