fix assertRaises calls

[davidszotten]

started looking at using pytest a bit more and came across these broken tests

the existing implementation was calling the function too early, and was just asserting that trying to call the returned None raised an exception (TypeError from attempting to call it)