Added test for disabled domain. Removed hardcoded rpInfo per fmarier