somewhat better testing