A few more code & test.