Resolved failing unit tests.