Fixed unit tests that were affected by the namespace changes.