Scoped new/update status and created appropriate tests