am 1cca0e5b: Merge "Tidy up of the Base64Test"

* commit '1cca0e5b4ec31f243072ce659afa7fde9bded5d5':
  Tidy up of the Base64Test