Update code, back over 80% code coverage