Updated test files and plan with address modes