Moved where the CryptoError tests were; added more tests