Fix some API issues, remove pipe expectation