Doh, missing config stuff
More test coverage