More tests and stuff.