more blocks with individual names and fixes for their tests
more individual names