Fixes...
All fixed.
Merge branch 'new_branch' into task-5
Fixes after Junit review