adding more page types
fixing issue where pages need to be combined
fixing test for new combined pages