Fixed failing spec due to nil entities