Maybe we can leave this as is for now and I'll add tests in a new PR?