Added first part of unit tests