Modified a few tests to work better.