Some of the testing fixes weren't included into 2.1 and due to that, a few of the tests appear to fail.
Added tests from develop. The test results need to be modified for 2.0.
