Shortening namespaces and adding Operation tests