100% coverage and fixes #43