RFPL-2330: tests for Kitchensink Archetype fixed