Feature #46, added more test