Many fixes by tests results