merged critical fix from master
Fixed unit tests