fixing 2 failing tests