Update T3279 to use mask rather than block

I'm not 100% sure that this is still testing what it's meant to be
testing, but the test still passes.
Update a couple of tests to use mask rather than block/unblock
Update a few more tests to use mask rather than block/unblock
Follow the removal of blocked in base