Made counter exceptions nicer
Added documentation test TODOs