Few fixes to regression and integration tests