Some more tweaks while writing tests