switch tests to use new interface
remove old interface now tests aren't using it