Separated some integration tests