Changes to make automated testing easier