Namespaces clean up

- Made test helpers namespace shorter so that it would not have to be
included in test classes.
- Fixed, inconsistent test models/views namespace.