Cleanup and fixes

- Removes a stub from DPMS
- Removes unused imports from EOI test and adds individual test attrs