Added unit-test, general cleanup

- Added a unit-test to lock the delayed approval mechanism in the
  "normal" scenario
- Added some output in the build console for the delayed approval
- i18n of the user facing delayed approver texts
- Did some minor code refactoring