Refactor Tests - namespaced Commands and Tests