Fix statuses and tests