Moved additional test code within test class

Also reformatted some lines to be under 80 chars.