added gushim and updated tests for batyam