Add a few calls and integration tests