finished fixing the failing tests