Final fix to avoid building test code unnecessarily.