Add fixtures to test and fix pagination.
Merge dev into ci