Merge 2.0 into 2.1

Merge 2.0 tests into 2.1