Follow up to fix failing unit tests