Ok, I guess we can include that test in the entity context. It would work at least if you pass the table key in the context array