Add more test cases
Cover all new valid test cases