Initial unit testing for new API