Removed more parts of tests that tested or expected post-2.0 functionality.
Added tests from develop. The test results need to be modified for 2.0.