Move test classes into mock directory and add test namespace.
Merge branch 'test-namespace' into develop