Feature: 2 new unit tests