fixing ordering in tests

the control strings changed, this
was causing tests to break.

should be fixed now