Added basic get/set functionality
Refactored tests