Add missing files, move spec test to cms "namespace"