Tests refactored for non-namespaced collection