Finish tests for API improv branch