adopted tests for new api structure