Adding some challenge
Fixing unit tests
Adding documentation