Adding retirement policies
Adding policy profiles
Modified the test to use wait_for
SOAP calls fixed
Some fixing up. Will finish that next week