Adapting unit tests to final api design