Updated Pages and Tests