more tests and updates