fixed the failing unit tests