Addresses issue #86

Both requested tests implemented.

Hope I understood idea behind those tests right, because steps in description were not clear.