(2_DONE COMMIT).Some metods are not inlined now. Some tests added