New tests
Some deletion.