Fix and add unit tests