Updates tests to match code style and to Assert on only one line.