Feature: 3 new unit tests