[NEW] make unit tests working