Add tests for user model
Cleanup regexp
Add tests for user associations
Fix minor bug and add tests for associations in annotations and bookmarks