> Fixing unit tests