Added another DIRTY test; trying a few more combinations; no bugs there