Use names consistently, add base64 test case.