Merge "Tidy up of the Base64Test"