Update configuration & skills for cv
Update tests
Update admin tests