Merge pull request #9 from mcuadros/blame-cleanup

blame code reorganization, and mutting the test