PROBCORE-453 Fixing bugs found by Fixbugs
Fixed failing test