remove extra blocks, update testing, modules, objects, arrays