Fixed the tests so they won't fail after Ruaridhs fix.