Added accessors and test