Delta calculation tests refactoring