tests and some modifications ID-244