added new tests, fixed tests workaround for 2.1.3 bug