add Getter and Tests