Add some more tests and stuff.