Merge 2.0 into master

Merge 2.0 tests into master