more cleanups
use coverage exclusion keyword as suggested at: http://nedbatchelder.com/code/coverage/excluding.html