fixes to make testing easier