Merge pull request #482 from code-dot-org/staging

DTT
DTT
Merge pull request #484 from code-dot-org/staging

DTT
DTT
fix unit test user_test