Fix up the failing unit tests