Fixed unit tests - or commented out.