Refactor tests
Add isolation of users' data
Clean up tests