fix tests, fail early for CNNs