unit test fixes for should v 2.x.x