adding memo type, cleaning tests