Updated root namespace for Infrastructure.

Corrected expected exception in some unit test.