Minor fixes and tests

Signed-off-by: hana-ko <hana.ko@o2.pl>