Lots of editing in FacadeTest, Facade and Worm; see changlog for details