Don't use old interface
Clean-up test code