Added Test to main structure