Added new test and fixed other tests that had become broken.