Updates to make testing work