A few more slides on effect architecture (and test code tweaks)