added a couple of tests... sorry I'm kinda OCD about tests :(