More tests and setup