Feature #46, adding some test
Feature #46, adding some test