APOLLO-2114 Updated accessors and unit test