* Fixed broken tests.