Fixed many tests for the new status system