Some more tests and such.