Tidying up unit tests
Merge pull request #100 from fmtvp/etv

Tidying up unit tests