* Fix tests