updated the cms
refactor the functional unit tests