Increase test coverage.
Tidy up.
Don't mark boundary as invalid when it should be marked unusual.