Fixed unit tests :-)