fixed unit tests but not yet coverage