Adding some extra tests to cover more lines