more unit tests adjusted