Small changes to unit tests
Took a disabled unit test case back into use.