Post test #4 bugfixes