adds api tests
solve merge conflicts