Tidied up the simple parts
Merge pull request #25 from jbrooksuk/self-test

Tidied up the simple parts