more tests and work with david