cleanup of test functions, added some comments, changed newline into a constant defined at the top (in case we want to make this into <br /> or whatever)
boat definitions