More tweaks to user tests. More to go.