moved assertOld to utils for better unit test mainly, fixed some bugs