somewhat better tests