fixed more failing tests