Refactor object collections, support new pagination API
Update tests for the fact that count is no longer returned in new API
Warning patrol