diff --git a/src/app/app.component.spec.ts b/src/app/app.component.spec.ts
index ab98f52..adb0d4a 100644
--- a/src/app/app.component.spec.ts
+++ b/src/app/app.component.spec.ts
@@ -5,6 +5,7 @@ import {InputComponentManagerService} from './input-component-manager.service';
 import {Step} from './step';
 import {ConverterRegistryService} from './converter-registry.service';
 import {Converter} from './converter/converter';
+import {VersionComponent} from './version/version.component';
 
 describe('AppComponent', () => {
   let sut: AppComponent;
@@ -30,7 +31,7 @@ describe('AppComponent', () => {
   beforeEach(async(() => {
     /*return */
     TestBed.configureTestingModule({
-      declarations: [AppComponent],
+      declarations: [AppComponent, VersionComponent],
       imports: [FormsModule],
       providers: [
         {provide: InputComponentManagerService, useValue: inputComponentManagerServiceStub},
diff --git a/src/app/converter-registry.service.ts b/src/app/converter-registry.service.ts
index 84e013e..16520e7 100644
--- a/src/app/converter-registry.service.ts
+++ b/src/app/converter-registry.service.ts
@@ -1,5 +1,5 @@
-import {Base64Decoder} from './converter/base64decoder';
-import {Base64Encoder} from './converter/base64encoder';
+import {Base64Decoder} from './converter/base64-decoder';
+import {Base64Encoder} from './converter/base64-encoder';
 import {BinToDecConverter} from './converter/bintodecconverter';
 import {Converter} from './converter/converter';
 import {DecToBinConverter} from './converter/dectobinconverter';
diff --git a/src/app/converter/base64-decoder.spec.ts b/src/app/converter/base64-decoder.spec.ts
new file mode 100644
index 0000000..888d69d
--- /dev/null
+++ b/src/app/converter/base64-decoder.spec.ts
@@ -0,0 +1,13 @@
+import {Base64Decoder} from './base64-decoder';
+
+describe('Base64Decoder', () => {
+  it('should create an instance', () => {
+    expect(new Base64Decoder()).toBeTruthy();
+  });
+  it('should have the id "base64decode"', () => {
+    expect(new Base64Decoder().getId()).toEqual('base64decode');
+  });
+  it('should decode "SGVsbG8sIFdvcmxkIQ==" to "Hello, World!"', () => {
+    expect(new Base64Decoder().convert('SGVsbG8sIFdvcmxkIQ==')).toEqual('Hello, World!');
+  });
+});
diff --git a/src/app/converter/base64decoder.ts b/src/app/converter/base64-decoder.ts
similarity index 100%
rename from src/app/converter/base64decoder.ts
rename to src/app/converter/base64-decoder.ts
diff --git a/src/app/converter/base64-encoder.spec.ts b/src/app/converter/base64-encoder.spec.ts
new file mode 100644
index 0000000..31c5b27
--- /dev/null
+++ b/src/app/converter/base64-encoder.spec.ts
@@ -0,0 +1,13 @@
+import {Base64Encoder} from './base64-encoder';
+
+describe('Base64Encoder', () => {
+  it('should create an instance', () => {
+    expect(new Base64Encoder()).toBeTruthy();
+  });
+  it('should have the id "base64encode"', () => {
+    expect(new Base64Encoder().getId()).toEqual('base64encode');
+  });
+  it('should encode "Oh, guete Tag!" to "T2gsIGd1ZXRlIFRhZyE="', () => {
+    expect(new Base64Encoder().convert('Oh, guete Tag!')).toEqual('T2gsIGd1ZXRlIFRhZyE=');
+  });
+});
diff --git a/src/app/converter/base64encoder.ts b/src/app/converter/base64-encoder.ts
similarity index 100%
rename from src/app/converter/base64encoder.ts
rename to src/app/converter/base64-encoder.ts