Update tests to match our content types