Barely finished WormTest, minor changes in other classes.