Added new feature on Test.aa