Use public setter
Add more tests