Adding test scripts for issue 2246 and 2830
Adding more tests and images