Post test #1 bugfixes