fix regression bug
Refactor Test namespaces

Move models and stores into separate namespaces / folders