More tests
Add to trace log on error
New verification classes