@busykai I think we should still make these small unit test changes too