0.9 updates and a unittest mirroring the example.