kwchen3 paulkim6: Brushup test cases for Avatar
kwchen3 paulkim6: Brushup test cases for Avatar