** Fixed unit tests