More tests and other things