Working on #34: add test