Refactored message test
Refactor user test
Refactor account tests