Cleaned up arbiter tests