Also rename some test files so they match the Makefile regex. They will be included in the test suite from now on.