fixed unit tests failures