- Fix spec which were wrong and made unit-test to fail
- Add more unit-tests