KH-220: Fixed tests and deleted obsoletes