Fixed a couple of tests failures introduced in the last commit.