more isolated tests for blocks
Merge branch 'master' of https://github.com/ernestocid/beta.git

Conflicts:
	br.ufrn.forall.beta/machines/others/BlocksForCharacteristicsTest.mch
	br.ufrn.forall.beta/src/tests/unit/BlockBuilderTest.java