fixed some failed tests