Changes to facilitate testing