Fixed test cases and made it as nullable