fixed: unit tests