tweaks/tests for api