Merge "Use allow/block/deny methods to improve test readability"