format rework
tests adjusted