Updated test and page