Test cases fix