Committed with more test cases