Webpage changes and Test code updates