Fix typo and clean up commented code
Name all var with test_block prefix