Integration tests - fixed request
Tidying placeholder swapping
Integration tests - respecting content types
Merge branch 'integration_tests' into develop