Bugfixes for Covertix SmartCipher tests

Added some fixes for correct detection and to avioid FPs