add test for incorrect activation code
remove unnecessary make_user code, add test for bad activation code