Add tests and remove some evil entries