changed integration tests to reflect layout changes
Merge branch 'css'