Fixed unit tests....