Add more unit test

[sjoerdtalsma]

Expected Behavior

Each class should have it's own unit test

Actual Behavior

Not every class has it's own unit test

Steps to Reproduce the Problem

1. Look at the sources in src/main/java
2. Look for the same source file in src/test/java with Test appended to its name

Specifications

• n/a