Code style updates
These flaky specs need investigation
Merge pull request #69 from alphagov/code-style-fixes

Code style fixes & mark flaky tests as pending while we investigate.