#12 Added test.
#12 misc