user attributes and test
small fixes