* Fixed tests