fix and some pages tests