New tests and fixes for 2.1.0 release.