* Added two builtin validation event triggers
* Better test coverage, although still needs work