Reinstating tests.
Namespace changes. Reinstated tests.