Needed for coverage 4.0 Change-Id: Id503a18d699a3e1263bd546b2b5329d89554a5e8
One step on a long path. Note that there is some noddy stuff in here like a pointless test - its in cookiecutter and I don't want to muddle code moves up with that, so 'meh'. Change-Id: I500b92c0e8177c85e696d039417dcf982010775b