diff --git a/encoder_test.go b/encoder_test.go
index 714ba02..d09c805 100644
--- a/encoder_test.go
+++ b/encoder_test.go
@@ -11,6 +11,16 @@ func TestInvalidPrefix(t *testing.T) {
 	}
 }
 
+func TestInvalidName(t *testing.T) {
+	values := []string{"invalid", "", "q"}
+	for _, val := range values {
+		_, err := EncoderByName(val)
+		if err == nil {
+			t.Errorf("EncoderByName(%v) expected failure", val)
+		}
+	}
+}
+
 func TestPrefix(t *testing.T) {
 	for str, base := range Encodings {
 		prefix, err := NewEncoder(base)
diff --git a/multibase_test.go b/multibase_test.go
index 0b490df..d688e66 100644
--- a/multibase_test.go
+++ b/multibase_test.go
@@ -35,6 +35,8 @@ var encodedSamples = map[Encoding]string{
 	Base32hexPad:      "t8him6pbeehp62r39f9ii0pbmclp7it38d5n6e89144======",
 	Base32hexPadUpper: "T8HIM6PBEEHP62R39F9II0PBMCLP7IT38D5N6E89144======",
 	Base58BTC:         "z36UQrhJq9fNDS7DiAHM9YXqDHMPfr4EMArvt",
+	Base64:            "mRGVjZW50cmFsaXplIGV2ZXJ5dGhpbmchISE",
+	Base64url:         "uRGVjZW50cmFsaXplIGV2ZXJ5dGhpbmchISE",
 	Base64pad:         "MRGVjZW50cmFsaXplIGV2ZXJ5dGhpbmchISE=",
 	Base64urlPad:      "URGVjZW50cmFsaXplIGV2ZXJ5dGhpbmchISE=",
 }