Removed some bogus tests, added some more Nil related tests