Translate change to taken check
Fix issue unit tests