Few debug improvements.   Unit tests passing on iOS 7 and iOS8.