fixed some tests
bunch of integration id