Merge pull request #130 from shruti-ramesh/new-amp-functions

New amp functions
Minor correction for amp/test_common.h which was causing build failure