Test for #15
Cleanup and cosmetics