#321: small fixes, added specs
#321: added specs