fixes for latest unittest lib >= 0.10.1

There are big-ish breaking changes coming to unittest.

angular is safe, except for using mock directly from unittest - `mock` has been moved to its own package.