fix return type for If. more tests.