Potential fix for #41: avoid running tests twice