fix 2.1 bug and update test