Cleaning up specs which are throwing errors from the upgrade to 4.1 - TRAD-33