[#19] some tests fixed