Additional signup testing and cleanup.