Fix of 2 failing tests.