[BUG #8185] restore monkey patched function
[BUG #8185] fix typo
[BUG #8185] move stdout test into own script
[BUG #8185] fix indentation
[BUG #8185] use camelCase
[BUG #8185] add more tests