Reconfigured test to make them more maintainable
New Report functionality...
Merge branch 'master' of https://github.com/mox1990/Project-Postdoc