Add unit test! What! :-) Also fix no-clobber. Oops.