Fix enforce message
Improve test coverage