Flesh out rest of accessor methods and tests