Added couple of tests and stuff.