LPS-40695 Readd, need to take care of != status filtering
LPS-40695 Fix broken tests