INtegration tests improving