Add tags and users. Add some tests