BITMAG-1063: Made smaller fixes. The source-code compiles -> thus it works !!! Though the tests does not... Fix tests to prove previous logic!