Fix System Testing