Unittest - Include additional test cases mentioned in the bugtracker