Feature #46, added more tests