Bug fixing: model field pagination and adding tests for pairing