Add beginning of test for #25