add pages, modified tests