Updates tests to reflect refactor/namespacing changes