Added support for two test builds