Updating per latest pylint gripes, fixing coverage up