INT-61: fixed two bugs
INT-64: fixed a bug
INT-60: added tests for diff