Removing JC's test nonsense