New tests and new fixes