Fixed all failed tests