Revert "Deprecate multiple names for tests -- use only one name"

This reverts commit 126e2e1a988e46c15dea0f01d7d7f7a6a7442d28.

Conflicts:
	client/demo_assignments/valid/hw1/tests/q1.py
	client/demo_assignments/valid/hw1/tests/q2.py
	client/tests/protocols/unlock_test.py
Merge branch 'master' into proj1-milestone
Fix tests for locking and unlocking