Further additions to user tests