New tests and test setup