Bug 1034780 - Changed generalInfo to systemStatus; Removed obsolete unittest