sync JS w/ coffee & correct tests