Add a regression test.
Move tests to more appropriate locations.