Added more tests.
Added nil modifier.