Adding tests
Merge pull request #160 from willyaranda/feature/tests2

Adding tests (reworked, with pages)