Merging tests from 2.0 underway: updating tests