Improve unit tests

[milmazz]

As is now, the project needs to add more robust unit tests.