added encryption utils testing
various bug fixes