Merge "Refactor BlockTest"