Roy - blocked a couple of tests while I figure out what's happening.