Pull request from Sonoko Hirano

Hello Mr Shepard, 

It was very enjoyable to work on this test. Please review at your earliest convenience. 

Sonoko Hirano