Mark a test xfail
Remove debugging code
Simplify class attribute interface
Cleanup
Add comments