fixed bug with skip/limit; updated test