new fixtures, fix some bugs in update method, refine tests