More tests and test infrastructure