~~ report refactor
~~ undo MessageBundle singleton
~~ catch scope test