[#30] tests fixed