Added todos for tests and final improvements to VariableAccess.