Testing improvements
Fixed indentation
Merge pull request #40 from GrahamCampbell/testing

Testing improvements