fixed some whitespace problems, and changed assertEqual() to assertEquals()