Removed singleton code from tests
Minor change
Deleting all userstate crud