Fix unittest.
Cleanup unit test skipping.