Fixed failing unit tests (meta failures)