New tests and changes