Still more examples and test cases added