Fix build
Fixed unit test