Cleanup
Add failing specifier set tests
Cleanup