accesser and test refactoring