Integration testing

fix all the things