Updated tests
Added setter/getters