Fixed pagination... cleaned up tests