fixes to make testing work