Feature #46, adding some tests