Removing / amending CLS tests