Fixed some failed tests