Changes in the unit tests - bugs and new tests are added