fixes following code review for storm - fix ConfigKey refs, and some tidies to tests (though live tests still not working beyond andrea's machine)