Integration testing done some bug fixes and clean up