New test structure

AMD change passes tests
git ignore