Some interface cleanup and add tests