M: ChocolateDraw/ refactoring
M: repair broken js test