extra tests + getters for location added