simplify translation keys
simplify logging in tests