Made a few modifications to tests to make them easier to read.