Title: JUnit test is 100% with mock after refactor

Description: After the first change in the interface the JUnit was
written to adapt to it, and also the mock. The interface was refactored
again after that.
Commit: Christopher