Integration tests rework