More tests and stuff