Getter fix +  tests