change in public interface. Add some test