Fix tests and page storage remove