add inital update conflict test
remove unneeded semicolons,  add some semicolons
make tests a little less javay