Fixed unit test too