Added more test cases and plots