cleanup
split test/API