Made Section & Block use name instead of id

Adapted tests too