Re-add and update tests for attribute set + add missing ones