fix up tests for interface refactor