Added all the right indicators.  Removed integration test for courier.