re organization and consolidate tests