Refined sign up and tests