Add unit tests for new wrapper functions