Move back intg tests from content
Merging
Merge 2
Fixing bugs after merging