updated to modern 1.6, fixed for 1.5, added UPDATE tests