fix of failing tests pt 1