deleted redundant tests, use crypto, minor fixes