Develop

ADD amp test cases and resolved eprs