Fix failing spec and first stab at pagination