Fixed some failing tests