New tests and some modifications