Fixed test cases
Fixed space problem for FI/PI