Add author tags. Reformat code. Split test for exceptions into two methods. Original pull request: #448.