Fix failing spec and first stab at really simple (read: stupid) pagination