Refactored set calls
Updated unit tests