Add tests and interface renaming