[#28] tests fixed
[#29] tests fixed