Slightly better tests