Merge pull request #92 from irq/interfaces

Interfaces for unit testing