Adjust tests to match new Automake files