Can you add unit tests for this and the similar following updates.