Yes, let me add some tests for this and make the changes