added 2 extra blocks in Testing and Treatment and fixed the other blocks