Simplify the _convertMask function somewhat
(#331)
Minor simplification of test suite to put all assert_raises calls within a single try block
(#331)
Simplify test_masks by moving common code to a function.
(#331)