fix also and add unittests