Test to master

Merge test changes on master for 2.0.0