Add test to override both layout and content type