non-func tests finished
Merge branch 'master' of https://github.com/MichaelRoddy/PSD3