Some fixes and updates for attributes
Some updates/fixes for tests
Some more fixes for tests