fix spec failing in production due to deleted records
refactor 2 specs for readability