move tests to proper locations
refactoring: access mode