fix the interface setup, update tests