Test service status separately

Sometimes the 2 services return in different orders so we'll test for
each one separately
split those strings on their path
check for multiple strings in the test
remove commented out code
Merge pull request #7057 from s0undt3ch/0.16-merge

Some more 0.16 test case cherry picks