Task#12537: Create UnitTests