fixed test and added unit tests for org admins landing on their org page when they reset their password

* Pre-approved users (ie. ones created by an admin) are now redirected to their organisation after clicking through from email and logging in
* Only major change necessary to spec was adding another step in the before block to create a pre-approved user