Improves test coverage

- [ ] don't merge until it's done, will add more tests
- [ ] @ewinslow @brettp confirm that AMD changes are correct