fixed the failing tests