Updated the codebase so that "setup.py test" will now work
Merge remote-tracking branch 'origin/develop' into develop