[#56] fixed the tests but they fail