Simplified constructor
Consolidated production and test constructors