@GregAshton I noticed a few minor portability issues when running the tests on different platforms (cluster nodes, MacOSX), these patches fix all those I've come across.
/cc @dkeitel