Improvements to help with testing