Add annotate for models and add initial user model tests