new tests from kw
new tests from kg
updates to tests (sync w java)