fix data struct GET/SETS; add tests