Unit tests

Merge after merging cleanup and python_2to3 branches to master.

changed milestone to %Passoft to python 3

assigned to @gbates and @ldam and unassigned @lloyd

approved this merge request

merged

mentioned in commit 0a20c4d3