remove extra comma, and fix test cases