Removed some Testes
Updated Pagination function to use the build in one.