Removed incorrect fix in unit tests