Fix test

This is just Craig's master branch from his fork, with the test commit reversed. 

2 comments:

1. We should be using topic (aka feature) branches for everything, not committing directly to master
2. We should move the changes to cod_session into a feature_override *before* merging this into Master. 

So, please do not merge this in yet!