Change the interfaces with unit tests