Update tests
Merge branch 'master' of github.com:subbly/cms
Fix a big mistake