Fixed unit tests accordingly