Fixed some more failing tests