add new tests + some modifications

Signed-off-by: Zvonimir Fras <zvonimir.fras@sartura.hr>