Ensuring that a user only must agree to ToS once
Tweaking tests for greater clarity