updated tests, 2 out of 4 passing, also commented in js