Slightly better tests.