Could you add tests for this?