* Add diagnostic info * fix * change order * update tests
Co-authored-by: Franck Nijhof <frenck@frenck.nl>