Updated more files/Added test for AMI