added new testing pages and reorganized