Post Test #2 bugfixes