Tests now work with python3
Merge branch 'jdangerx-develop' into develop