Test cleanup.
Refactoring and block tag handlers