Fix failing unit tests.
Additional check