Added coverage for bugs fixed in the previous commit