Fixed failing unit tests from yesterday