various improvements across the board
update integration tests skeleton