Removed deprecated KeyWrapper methods and cleaned up test.