Cleaned up transfer tests