more tests and fix proxy api