Punctuation, don't output stuff when testing
Use reduced rescue syntax & adjust test
Merge branch 'adjust_callbacks'