Cleaned up views for easier testing
Tests passing for user and project flow