After adding pollice's delta tests and refactoring