Update latest test failures. This will need to be revisted post acceptance