More unit testing
Merge branch 'jonescd'