A few missing cases that simple to solve were reported by the coverage tool.
Added tests that cover areas that weren't tested before.