Changes to Allow Code Testing