[fix] new interface, hence new implementation and fixes for unit tests