Issue #27: adding tests