Fixing some non working tests.