Addition of unit tests