Cleaned up admin matching test