Trying to figure out merchant issues, added tests and cleaned up code, unable to duplicate