more tests and api adjustments