Fix test database persistance issue
Add additional user tests