Fix setting of options per page and update tests.