Removed the old cms_admin, changed where its references it, removed any old links to cms_admin, fixed some tests???