Updating based on Api changes, added new tests