updated api, fixed tests, fixed test config