Test service status separately

Sometimes the 2 services return in different orders so we'll test for
each one separately