Feature #46, adding tests