Cleaned up merge test