Adding Different Test Suites for new and Old Architechture