Fixed chainability of the setter/getter & added test