Adding new unit tests
Formmating code