More changes to avoid tests failing
Move feature specific code to features .module files