Remove BuilderMockV0
Fix tests
Fix error message
Merge pull request #1265 from eordano/fix/1052

Remove BuilderMockV0