Simplify testing, added more test for sorting and pagination