Fixed the unit tests as a result of changes