Edit doc according to unit tests changes

added formatting
fix conflicts