[#55] tests fixed