Update tests

Conflicts:
	cms/plugin_pool.py
Add dummy one_thing app to fix tests