add states for test and minimized cls for blocks