Working on in-state friends...
Cleaned up tests
Finalized signup test cases, etc.
Resolved merge conflicts