Started in on some tests for #52.