slightly better tests