Add slightly-modified 2.0 test. Does not pass yet.