finalize #658 - add tests, localizations, email (pending approval)