Added line #L1320 was not covered by tests

Added line #L1020 was not covered by tests

Added line #L553 was not covered by tests

Added line #L114 was not covered by tests

Added lines #L116 - L117 were not covered by tests

Added line #L120 was not covered by tests

Added line #L23 was not covered by tests

Added line #L25 was not covered by tests

Added line #L28 was not covered by tests

Added line #L30 was not covered by tests