Fix some failed tests