Adding ISO7064
Refactoring Mocks and Interfaces