Increase branch coverage by adding some missing tests