Updated source package namespaces and use tweaked httpclient for tests