Fixing tests to cater for last change