Date formatting
Add new status options

Also, added new factories and refactored tests