Add a test for the previous commit. Also, remove two tests that were

testing a) the wrong behavior or b) something that I'm already testing
in the new test.

llvm-svn: 153525