changed relationship in user model, fixed view, and cleaned up code in the test