Add more tests and validate that there is only one comma