ref #4123 - adapt the unit tests for the system state calculation