added and fixed test cases related to issue #133