enhance accessor logic and tests