more demo test tweaks