Remove unused unit test.
Fix failures in unit test (false negative ones.)