Updated base to use target uri. Use expect style for some tests.