clean up unneccesary callback function and add test