Small fixes, add missing test to start new great adventure with TDD approach ;)