Fix all UNIT tests

There is at least one test failing running mvn clean package.