Performance improvements, encrypt existing tests