fixing attributes and better tests