Fixed broken unit tests of last commit