added more test cases and samples