Small changes to control test code