removed unnecessary imports and fixed inconsistency in unit tests naming