Tests for this can't run at the moment because of CONFIG setting
conflicts.
Merge pull request #332 from mbucknell/NAWQAAN-229

Tests for this can't run at the moment because of CONFIG setting