small change to catch certain state changes early instead of waiting for a time out on the expected state
fix intermitent test failure, add a comment tag which is populated with the unit test name to help pin point where resources have been created