Update unittest as well