[#61] FIx tests