* Fixed all unit tests