quick nil test
added tests, remove unused stuff