reorganizing; added test for assets and pages