cleanup
fix more tests
Merge pull request #9 from sarkasm/map-blocks

tests