Fix test statements
Also, fit on 80 lines