B-60117 Fixed unit tests