Adding comments and adjusting paging numbers

Change-Id: Ic3ac489544c1e793b2c0bca2763983e06c6d898a
Updating tests to use secret id getter method for orders

Change-Id: I4274808208d3b069700498999605913086b65116